Better fix.

2006-06-20  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktreeview.c (gtk_tree_view_set_column_drag_info): Better
	fix.

diff --git a/ChangeLog b/ChangeLog
index 651c0d7979c82d329ea28cc03c5e57148ae755ee..3cb6e41e79b8059369086bd9374244639727de0c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-06-20  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreeview.c (gtk_tree_view_set_column_drag_info): Better 
+       fix.
+
        * gtk/gtk.symbols: 
        * gtk/gtkprintsettings.h: 
        * gtk/gtkprintsettings.c: Remove unused print-to-file setting.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 651c0d7979c82d329ea28cc03c5e57148ae755ee..3cb6e41e79b8059369086bd9374244639727de0c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2006-06-20  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreeview.c (gtk_tree_view_set_column_drag_info): Better 
+       fix.
+
        * gtk/gtk.symbols: 
        * gtk/gtkprintsettings.h: 
        * gtk/gtkprintsettings.c: Remove unused print-to-file setting.

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 4307f9c7d0e63a6bcfc663385d53d0d6c43f7e21..dd0eddbb64d59e77f98a8e21e370b5bea5debe91 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -9028,7 +9028,7 @@ gtk_tree_view_set_column_drag_info (GtkTreeView       *tree_view,
 
   /* We know there are always 2 slots possbile, as you can always return column. */
   /* If that's all there is, return */
-  if (g_list_length (tree_view->priv->column_drag_info) < 2 || 
+  if (tree_view->priv->column_drag_info->next == NULL || 
       (tree_view->priv->column_drag_info->next->next == NULL &&
        ((GtkTreeViewColumnReorder *)tree_view->priv->column_drag_info->data)->right_column == column &&
        ((GtkTreeViewColumnReorder *)tree_view->priv->column_drag_info->next->data)->left_column == column))